fuse: Propagate dentry down to inode_change_ok()

To avoid clearing of capabilities or security related extended
attributes too early, inode_change_ok() will need to take dentry instead
of inode. Propagate it down to fuse_do_setattr().

Acked-by: Miklos Szeredi <mszeredi@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
[carnil: backport for 4.8]

Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name fuse-Propagate-dentry-down-to-inode_change_ok.patch

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index eb5373a026e33ce241c1bbc94c6b30b779da458c..597178be858256033aa47818ca685178b9cfd8b8 100644 (file)
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1591,9 +1591,10 @@ int fuse_flush_times(struct inode *inode, struct fuse_file *ff)
  * vmtruncate() doesn't allow for this case, so do the rlimit checking
  * and the actual truncation by hand.
  */
-int fuse_do_setattr(struct inode *inode, struct iattr *attr,
+int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,
                    struct file *file)
 {
+       struct inode *inode = d_inode(dentry);
        struct fuse_conn *fc = get_fuse_conn(inode);
        struct fuse_inode *fi = get_fuse_inode(inode);
        FUSE_ARGS(args);
@@ -1732,7 +1733,7 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)
        if (!attr->ia_valid)
                return 0;
 
-       ret = fuse_do_setattr(inode, attr, file);
+       ret = fuse_do_setattr(entry, attr, file);
        if (!ret) {
                /* Directory mode changed, may need to revalidate access */
                if (d_is_dir(entry) && (attr->ia_valid & ATTR_MODE))

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index a621dd98a86525ecbacb14c096ca09ed5ba12794..c264a62cc7bd17d14d51fc493ee35fb2ff6a64ed 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2848,7 +2848,7 @@ static void fuse_do_truncate(struct file *file)
        attr.ia_file = file;
        attr.ia_valid |= ATTR_FILE;
 
-       fuse_do_setattr(inode, &attr, file);
+       fuse_do_setattr(file_dentry(file), &attr, file);
 }
 
 static inline loff_t fuse_round_up(loff_t off)

diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index d98d8cc84defb45e28a40829210b5c36ac8ff2f1..cace5526c6d65286ade536592790f77d71636b1a 100644 (file)
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -958,7 +958,7 @@ bool fuse_write_update_size(struct inode *inode, loff_t pos);
 int fuse_flush_times(struct inode *inode, struct fuse_file *ff);
 int fuse_write_inode(struct inode *inode, struct writeback_control *wbc);
 
-int fuse_do_setattr(struct inode *inode, struct iattr *attr,
+int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,
                    struct file *file);
 
 void fuse_set_initialized(struct fuse_conn *fc);